fixed couple questions
fixed question
Merge pull request #547 from adamarla/master

question fixes