Merge branch 'feature/aegis'
Merge branch 'master' of https://github.com/anodyne/nova3