Fixes bug with URL encoding. (thanks, Will!)
Merge branch 'dev'