bug fixes
Merge pull request #188 from clovis/master

bug fixes