Merge pull request #409 from guillermooo/dev

Dev
Merge branch 'master' into dev