updates
Merge pull request #11 from chicagocamps/master

updates