Merge pull request #25 from jkozera/patch-1