Fixes #94.
Merge pull request #95 from frmwrk123/technicalDebt/deprecatedFunctions

Fixes #94.