These aren't used and shouldn't be hardcoded
Merge pull request #7 from ascarpino/master

These aren't used and shouldn't be hardcoded