Fix Issue #14 and deprecations.