Prop and planet imported
Merge branch 'master' of https://github.com/Velro/Aegis