improve collator
Merge branch 'master' of github.com:dose78/CARDIO