Fix issue #15 and #24
Merge branch 'master' of https://github.com/Apptitive/Ma-o-Shishu