Merge pull request #2 from dwise006/master

This should bring up to date
Merge pull request #3 from dwise006/kwals010-master

Merge pull request #2 from dwise006/master