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