Base 1.7 support

Just making it work for 1.7