Worked on a slightly improved short option parser