WIP
Merge pull request #30 from davidfowl/v2

WIP