Implementation PR for #115
Implementation PR for #115