* Amended docblocks as requested
* Construct param orders changed
* Variable changed to match other pull request.