Merge pull request #2 from bursteg/master

123
Merge pull request #3 from bursteg/stage

Merge pull request #2 from bursteg/master