Added argument and support for URLs
Merge branch 'master' of github.com:thezelja/bitstarter