Update for Mimosa 2.0
Merge pull request #2 from Diego-T/master

#1 Update for Mimosa 2.0