Removing dependency on ServiceObject
Merge pull request #129 from cdearborn/pull-req-master-76c2cf77640f14a4fcc90803246eb5148e3beead

 [2/2]