changes to use actual API rather than localhost
Merge commit 'd8a6c66ab7a2f05e8550126430a829b6e4ef3ea8' into HEAD