WIP
Merge pull request #6 from jwhonce/wip

WIP