WIP
Merge pull request #7 from jwhonce/wip

WIP