Fix pick 2 questions
Merge pull request #2 from buzzedword/patch-1

Fix pick 2 questions