Continued work on Bruno Lang's 2.1 algo
Merge branch 'master' of https://github.com/grantathon/atlas