Merge pull request #143 from tomekw/master

#4
Merge pull request #144 from tomekw/update_readme

Merge pull request #143 from tomekw/master