aeidelman Merge pull request #410 from rsksmart/aeidelman-patch-8