Permalinks (fixes #53)
Merge branch 'permalinks'