updates
Merge pull request #1 from cmillerOT/updates

updates