Merge pull request #18 from TobKed/deprecate