Merge pull request #31 from DarkDimius/fix-deprecation-warnings

Fix deprecation warnings
Merge branch 'master' into jvm-comparison