Dev
Merge pull request #54 from Kejishe/dev

Dev