ace upgrade
changed sort order
spacing
Merge pull request #663 from daeks/master

ace upgrade