#1388
closed #1401
more small fix
Merge branch 'dev' of https://github.com/yupe/yupe into dev