Dev
Merge pull request #50 from Kejishe/dev

Dev