Fixed adding timestamp querystring for url

If target url already has '?q=' then timestamp will be added as '&=...' instead '?=...'
Merge pull request #82 from sattellite/patch-2

Fixed adding timestamp querystring for url
Added more tests.
Merge pull request #83 from dixso/develop

Develop
Merge branch 'master' into gh-pages