Bugfix with two-bytes addresses
Clean version for public repository
Version used for the ASSS'21 paper