rob's proposal
Merge pull request #14 from rswill/master

rob's proposal