fix issue #40
Merge remote-tracking branch 'origin/server' into server