Merge pull request #5 from cyclops8456/helium

Commits for Bug #318/319 and Bug #320