fix compare method
merge master branch fixes