#1218
Merge branch 'master' of https://github.com/yupe/yupe