Merge pull request #26 from karussell/patch-2