MP6 is dead. Long live MP6!
Merge pull request #302 from danielbachhuber/patch-3

MP6 is dead. Long live MP6!