resolve freeze problems after build
Merge branch 'master' of https://github.com/swr-dev/WVJM2014