Updated to use service
Merge pull request #198 from dshurt/master

Updated to use service