Apply hydrogenesis work from #206 and make a pretty pull request out
of it
Merge pull request #208 from cburroughs/apply-206

apply #206 for vvuksan and make a pull request