bumped to v0.40.4.0
bumped revision to 0.40.4.1 for dev
fix some hints found by Android Studio code inspection
fix object comparison
Merge pull request #1017 from cascheberg/fix-analysis

@cascheberg fix some hints found by Android Studio code inspection