Adding --no-sort option (fixes #80)
Merge remote-tracking branch 'timdp/master'