trying to merge
Merge pull request #2 from katzdave/master

trying to merge again