Merge pull request #22 from hafen/dev

Update links in README
Merge pull request #28 from hafen/dev

Dev
Merge pull request #29 from hafen/dev

Dev