Merge pull request #11 from laserlemon/master

Clean up supporting code