fix up
Merge pull request #1 from imercm/master

fix up