awkward as fuck.
Merge pull request #21 from zack/dev

awkward as fuck.