Issue152 masa opt in out config

Fixes #152