Main::compare() fix
Merge branch 'dev'