Merge pull request #40 from cgoodling/new

New
Here is the earlier version that was overwritten