Merged latest mutiny fixes.
Merge pull request #206 from alex-gh/mutiny_fixes

Merged latest mutiny fixes.