Merge pull request #143 from tomekw/master

#4