Merge pull request #27 from thierryvolpiatto/master

Merge last changes from my fork