Should be more in line with the other modules. Even though the older way has its advantages, uniformity is very important too
Merge branch 'master' of https://github.com/Nimaear/Singularity