Merge pull request #27 from jkozera/patch-2