Merge pull request #21 from dkgroot/patch-1