Merge pull request #400 from guillermooo/dev

Dev
Merge pull request #401 from guillermooo/dev

prep release