updates
Merge pull request #1 from NolanFoster/nfoster

updates