Merge pull request #158 from MargaretLangley/master

Completion of class odering