Merge pull request #15 from Kejishe/master

Update Branch
Update ticket/*
Merge pull request #16 from Kejishe/dev

Dev