Updating to latest changes from bradybernard, version 6.2