fix readme merge conflict from #85
Merge pull request #86 from evendis/remerge_85

fix readme merge conflict from #85
Update README.md