Updated to commit v2.0.0-1-g847a8f8