Update to Macroid 2.0.0-M2