Merge pull request #1 from mmes2/master

sync repos
Merge remote-tracking branch 'upstream/master'
actual tested code
Merge pull request #10 from Josh-Willhite/master

services update
Merge remote-tracking branch 'upstream/master'