Merge branch 'master' of https://github.com/52North/WPS
Merge remote-tracking branch 'upstream/master'
fix for #77
Merge pull request #105 from nuest/bugfixes

Bugfix for #77