fix
Merge branch 'master' of https://github.com/jsCONFIG/jigsaw
fix