Merge pull request #639 from adamarla/master

corrections to questions
Merge pull request #640 from adamarla/master

added watchout message
added versions
Merge remote-tracking branch 'upstream/master'