Merge pull request #4 from cyclops8456/helium

Commits for Bug #321 and Bug #333