Merge pull request #192 from szczepiq/master