Expand with links/etc
Merge pull request #6 from theopatt/patch-1

Expand with links/etc