Updated to latest dev branch