Fix warnings for MRY
Merge pull request #134 from wajam/alex-fix-warnings

Fix warnings for MRY
Integration test
Merge branch 'master' into manu-klof-fix