switch to conditional binding in Server class init
Merge remote-tracking branch 'origin/master'