Mutiny fixes
Merge pull request #137 from ZomgPonies/master

Mutiny fixes