This is is a tmp fix to get this branch working since the other was broken.
Merge pull request #89 from cremalab/fix_master-MAO

Fixing Main