bug_1039
Merge branch 'master' into bug_1039
bug_1039, sort test
bug_1039, fixed format code
bug_1039, more readable fix
Merge pull request #7 from kkorekk/bug_1039

bug_1039