simplification of code
added comment to answer question
Merge remote-tracking branch 'origin/master'