Pull request to merge Aba-Sah's version into the master version