server self.onStop was never being called
Merge branch 'dev'
v0.1.1