Merge pull request #25 from JoeDou/dev

merge dev to master
Merge branch 'master' of https://github.com/JoeDou/Famo.us-Monospace