Merge pull request #1 from PdxCodeGuild/master

update
data and output only
Merge pull request #3 from kevinelong/master

data and output