Merge pull request #136 from jonasdt/master

Fix error message
Merge pull request #140 from jonasdt/master

Fix invalid urls. This fixes issue #116.