Fixed bugs in sort3() and simplify()
Merge branch 'feature/simplify' into develop