update with Matt's suggestions
remove answers
Merge remote-tracking branch 'upstream/master'