Merge pull request #29 from Kejishe/master

Dev
Update Codes
Merge pull request #30 from Kejishe/dev

Dev