FIXED: Deprecated functionality
Merge pull request #1 from tractorcow/master

FIXED: Deprecated functionality