Fixes #11.
Merge pull request #12 from frmwrk123/technicalDebt/deprecatedFunctions

Fixes #11.