backing up the stage
Indentation fix and better test main
Merge pull request #1 from edincanada/stage

stage into master