Merge pull request #1 from fbergkemper/master

Update README.md
Merge pull request #3 from fbergkemper/barbossa-2.0.0

Merge pull request #1 from fbergkemper/master