prep release
Merge pull request #408 from guillermooo/prep-release

prep release
Merge pull request #409 from guillermooo/dev

Dev