initial commit from version 1.5.1
Merge pull request #1 from pabloromeu/master

initial commit from version 1.5.1 - Thanks, Pablo