Merge pull request #177 from tzumainn/master

Minor corrections to make terminology consistent
Merge pull request #178 from tzumainn/master

Fix to set provider locale properly after redirect