Merge pull request #254 from DariuszOstolski/issue253