Updated optparse-compatible version