Added more bad-assery
Merge pull request #1 from bsiegel/test_branch

Added more bad-assery