Merge pull request #11 from guillermoandrae/develop

0.4.1
Merge remote-tracking branch 'origin/master' into develop