Merge pull request #22 from hafen/dev

Update links in README
Merge branch 'dev'