Static option order support

For issue #361