Merge pull request #24 from Hedda/patch-1