updates
Merge pull request #9 from jmmaloney4/dev

updates