fix compare method
merge master branch fixes
merge 1.5.2 branch