Merge branch 'release/1.0.0'
Merge branch 'release/1.0.1'
Merge branch 'master' into develop
Fixed location of server.js