Merge pull request #245 from DariuszOstolski/issue211