Updated to Fantomas 0.9.7