merging upstream/master
Merge pull request #163 from jasonalmaturner/master

changing endpoint urls