Merge pull request #47 from ZooTypers/master

getting updates
pushing changes of getting rid of logout method in options
Merge pull request #214 from nhlien93/master

pushing updates