Applying changes from PR 450
Merge pull request #458 from wpreul/feature/readme

Applying changes from PR 450