Fixes #85 & addressed #84