Merge pull request #1354 from msabwat/emscripten