Rebase/Merge
Merge pull request #1 from KangProject/master

Rebase/Merge