Added Service interface. #264.
Merge origin/master