implemented reviews from https://github.com/globaleaks/GLClient/pull/54