sort options in conf file
Merge branch 'hotfix/1.0.4'