Update links in README
Merge pull request #24 from hafen/master

Update links in README
Merge remote-tracking branch 'upstream/master' into dev

* upstream/master:
  Update links in README
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Update links in README
Merge branch 'master' into dev

* master: