Updated for latest development release