Merge pull request #172 from electrical/master

[TESTING] Make ordering optional