conflicts on README from #48 and #50
Merge pull request #51 from stringparser/readme-conflicts

conflicts on README from #48 and #50