updates
Merge pull request #1 from jbencook/conor

updates