Merge branch 'release/0.4.0' into develop
Clean up log streams a bit and use express 3.18
Merge branch 'develop' into hotfix/0.4.1
version 0.4.1
Merge branch 'hotfix/0.4.1'