bug fixes
Merge pull request #285 from clovis/master

bug fixes