Merge pull request #9 from majecty/master

Ship it.
Merge remote-tracking branch 'origin/master' into suburl