Cleaned up a bit
Merge branch 'master' of https://github.com/stalinshang/meidochan