commit
Merge remote-tracking branch 'origin/master' into newStage1
Merge pull request #62 from moyoron64/newStage1

New stage1