bump version
Merge branch 'stop-server'