Merge pull request #2 from meggawatts/master

For sanity's sake
Merge pull request #3 from meggawatts/master

Tracking
Merge pull request #4 from meggawatts/master

Actually make this thing work