Merge branch 'master' of https://github.com/Apptitive/Ma-o-Shishu
Merge branch 'master' of https://github.com/Apptitive/Ma-o-Shishu
Fix issue #33 and preference issue with SMS.

SMSs are manipulated according to user preference from now.