Merge pull request #5 from nealrs/eric-sandbox

Eric sandbox
Merge pull request #7 from nealrs/beta

Beta (includes eric-sandbox edits)