Merge pull request #16 from lramsey/master

move url change conditional