Merge pull request #36 from ChrisBoesch/master

update
Update URL according to user selection
Merge pull request #122 from LI-HE/master

Update URL according to user selection