Fixed issue #8 and verified in server console
Merge branch 'release/0.0.2'