Made option parsing a bit more sexy.
I said sex. In a commit message.