Merge pull request #106 from MarkEWaite/master-simplify-WorkingArea-use

Simplify use of WorkingArea