Merge pull request #78 from chdorb/patch-1