merge latest version of LdShake