Merge pull request #26 from pabloelices/master

Thanks.