Pulling Server API addition
Merge remote-tracking branch 'ddx/master'