fixed other bad comparisons
Merge branch 'master' into plus
bump version