fixed typo
Merge branch 'master' into answers

* master:
  fixed typo
answer 14
answer 15
answer 16