changes to option behavior
Merge pull request #111 from iampersistent/master

changes to option behavior