renamed and error checking|
Merge branch 'master' of https://github.com/tuckerbuchy/distributed-services