Issue #125 - Server Update