#13 using ?s as custom permalink - pull request

This is a branch of #68, make sure to check that issue first before this one.