Dev
Merge pull request #44 from Kejishe/dev

Dev