Merge branch 'release-0.3.2'
Cleaning up code, maybe making websockets work.
Merge branch 'hotfix-0.3.3' into develop