Slight bug in linking fixed (replace statement was never saved)
Merge pull request #16 from bean5/master

Forgot to save the location replacement
Merge pull request #17 from mshang/master

Merge link fix