adding answers from master
Merge pull request #11 from okokmaster/master

adding answers from master