Handles options somewhat better.
Merge branch 'master' of github.com:badave/authenticate