Merge pull request #201 from Kwpolska/master