fixes #7
Merge branch develop/server into develop