services updates
Merge remote-tracking branch 'upstream/master'
Merge pull request #261 from shalako/master

services updates