fix #358
Merge pull request #359 from jlipps/master

fix #358