Merge pull request #40 from ngoldman/master

Consolidation! Factories! Tests!
update README for v0.4.0