Merge pull request #324 from neheb/patch-1