Merge pull request #602 from neheb/a