894 Improvement optparse