Merge pull request #802 from pcercuei/address-sanitizer