Merge pull request #23 from hafen/master

Update links in README
Bump version
Merge branch 'dev'

Conflicts:
	DESCRIPTION