bug fixes
Merge pull request #193 from clovis/master

bug fixes