closed #1068
Merge branch 'master' of http://github.com/yupe/yupe