Updated to new release
Minor cleanup