Fix DeprecationWarnings

Fix #35