Merging wip for Helper.php
Updating documentation