Removed sorting of options (breaks on Python 3)