Merge pull request #12 from alephtwo/master

Ben, cody, and thoma's updates