Answered a two questions
Merge pull request #2 from garetroy/patch-1

Answered a two questions