Code: Fixes minor bugs.
Evaluations: Sort attributes by 'Order'.
Merge pull request #28 from am11/master

Misc. fixes.