Release

Merge branch 'server_development' into 'master'


Server development



See merge request !3

v1.0: Merge pull request #11 from marekrydlewski/client_development

Further improvements, added try-catch clauses in critical points