Stage 1
Merge pull request #3 from Blizzardking/master

Stage 1