fix bug from 02158d11ae3bac27730f79868792f87c235ac013
fix style and update minified version
Merge branch 'release/1.4'