my updates
Merge pull request #1 from marccampbell/master

my updates