Merge pull request #364 from neheb/patch-2