Fix issue #464
Merge branch 'master' of github.com:sq/JSIL