wip-4
Merge pull request #8 from michaelpigg/wip-4

wip-4