Merge Atlantis Comments

Merges concurrent comments by atlantisvoxel on GitHub pull requests