conditionalize to avoid deprecation in 2.0.0
Merge pull request #51 from tenderlove/2.0.0

conditionalize to avoid deprecation in 2.0.0