Converted to InProcess
Fixes #32
Fixes #29
Merge branch 'develop'