Merge pull request #3 from jdarling91/dev

Stuff I missed earlier.
Fixes a goof