Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
change uri scheme
Merge pull request #153 from patriot1burke/master

change uri scheme