Merge pull request #962 from andrerod/dev

Merge previously reviewed PRs
Update dependency
Merge branch 'dev' into generation