Merge pull request #10 from ccummings/wip

Update
Changes
More changes