Pr merged here: https://github.com/mertkahyaoglu/atlas/pull/27