Clean unused code and comments
Merge branch 'master' of https://github.com/Apptitive/Ma-o-Shishu
Fix issue #21
Merge branch 'master' of https://github.com/Apptitive/Ma-o-Shishu