Merge pull request #113 from gAmUssA/master

updated framework versions, addressed reviewers issues ch7