some new stuff, it need cleaning
Merge branch 'master' of https://github.com/iofun/lemon