Monstro: envelope bugfixes
Merge pull request #673 from diizy/master

Monstro: envelope bugfixes