closed #1659
Merge branch 'dev' of https://github.com/yupe/yupe into dev
closed #1711