Updated to latest dev version