Fixed issue #2 and verified in server console
Merge branch 'release/0.0.1'