Transferring wiki links towards 2014
Merge pull request #19 from schwindp/patch-1

Transferring wiki links towards 2014