Merge pull request #28 from jkozera/patch-3