bryans changes
Merge pull request #20 from afortune906/master

brians changes