Merge pull request #3 from dinoDachi/dev

Dev
Merge pull request #4 from dinoDachi/stage

Merge pull request #3 from dinoDachi/dev