Added Frameworks and slight edits to Task
Merge remote-tracking branch 'origin/master'