Use two phase init for MainFrame
Make Scene type explicit
Merge branch 'master' of https://github.com/HeliumProject/Helium