REPORT-553 - fixed ordering and added tests
Merge pull request #49 from jlkeiper/REPORT-553

REPORT-553 - fixed ordering and added tests