Merge pull request #39 from Kejishe/master

Dev
Dev
Dev
Merge pull request #40 from Kejishe/dev

Dev