Dev
Merge pull request #52 from Kejishe/dev

Dev