Option parsing fixes #7