Merge pull request #1 from mikacalvo/master

new changes