bug fixes
Merge pull request #116 from clovis/master

bug fixes