updates
Merge pull request #1 from seckhardt3/master

updates