Experimentation
Fixes based on feedback
Further corrections
Yet more changes
Merge pull request #5 from weswigham/master

Experimentation