Fixed typo
fixed access modifiers in server: no need for public methods
Merge remote-tracking branch 'origin/master'