Updates to make the tool work in ArcGIS 10.2.1