Support for 1.7.2

Added support for 1.7.2, Don't think I broke 1.5.X - 1.6.X.  Still need
to clean up code, probably added more than really needed.