Merge pull request #2 from dwise006/master

This should bring up to date