Merge pull request #1 from hybridauth/master

Get latest changes from original
Bug fix for when returning to the calling site outside of the popup window
Merge pull request #41 from lukos/master

Bug fix for when returning to the calling site outside of the popup window