Merge pull request #12 from alephtwo/master

Ben, cody, and thoma's updates
Merge pull request #15 from novoalg/master

Merge pull request #12 from alephtwo/master