Issue 21

Hopefully this solve's @natelong's issues in #21 but I'm open to suggestions on how it could be made more clear.