bug fixes
Merge pull request #278 from clovis/master

bug fixes