Monstro: more optimization
Merge pull request #1106 from diizy/stable-1.1

Monstro: more optimization