updates
Merge pull request #5 from mjhea0/master

updates