Merge branch 'webworker' into develop

Fixes  #1
Fixes #19