Interface update.
Merge pull request #33 from jonastinkle/design_change

Interface update.