added 0.7 support