API changes
Slight refactoring
Merge pull request #2 from mgodave/wip

Wip