refactoring and enhancing options
added better authentication
Merge pull request #1 from codeivate/improved_options

Improved options