Merge pull request #26 from poupotte/master

Some fixes
2.0.7
Merge remote-tracking branch 'upstream/master'