Merge pull request #22 from mrothe/patch-1