Changes
More changes
Merge pull request #11 from ccummings/wip

Wip