change default values and add keyfreq-merge feature#21

zimoun wants to merge 4 commits into

dacap:maindacap/keyfreq:mainfrom

zimoun:keyfreq-mergezimoun/keyfreq:keyfreq-mergeCopy head branch name to clipboard