Merge pull request #19 from davelab6/master

Merging Dave version