Real crap tank
Merge pull request #20 from asinner/andrewsbranch

Real crap tank