Updated to latest version of heirloom