Created by: Yuri-SVB
This PR is made as revision of PR 105, by @ihsraham, as requested by @lucas-tortora.