Updated to latest development version