Merge pull request #2 from ginxwar/master

added from master
Merge pull request #3 from ginxwar/stage

Merge pull request #2 from ginxwar/master