Merge pull request #35 from Kejishe/master

Dev
Merge pull request #36 from Kejishe/master

Dev
Dev
Merge pull request #37 from Kejishe/dev

Dev