Merge pull request #1 from evoskuil/develop

Catch up with develop.
Update README.md