fix bug
Merge branch 'master' of github.com:viticm/plainserver