bug fixes 1.10
Merge pull request #99 from liboud/master

bug fixes 1.10