Adding changes from #537

#537
Merge pull request #540 from wpreul/feature/readme

Adding changes from #537