Merge tonyfast to GT-MINED