Merge branch 'release/0.2.5'
compile js