Merge pull request #18 from gcborders/master

Pull request from Master to Sama - Apr 14
Content for Sama: Plan Scope Management
Merge pull request #20 from gcborders/Sama

Sama