Removing experimental designation, tidying-up the code
Merge pull request #130 from projecthydra/issue_129

Removing experimental designation, tidying-up the code