merging dev and eric....

* just merged the helper files