Merge pull request #36 from abergmeier/emscripten_fix