Merge pull request #138 from 4950/Michael/GrenadierV2

Michael/grenadier v2