Merge pull request #10 from cyclops8456/helium

Commits for Bug #291 and Bug #332