Fixing up some interface stuff
Merge pull request #30 from thefinestsieve/beta

Fixing up some interface stuff