Fix Issue #14
Fix deprecations