Merge pull request #111 from gAmUssA/master

addressing reviewer issues in ch5
addressing reviewer issues for ch6 (covered till ES6 modules)