Addressing reviewer comments.
Minor flow tweak.
Merge pull request #9 from elliottbiondo/master

Addressing review comments.