* apply 324a18e * sync up to 1c0d008 * sync with 1c0d008 and readme update * set correct commit hash * sync with #021f712