Properly deprecate functions

Pull request for #43