fix for issue 236.
Merge pull request #240 from jswhit/master

fix for issue 236.