Issue #85 - Updated packages + solution cleanup
Merge pull request #121 from TheTribe/feature/issue-85

feature/issue-85