Updating some files...
Merge pull request #3 from larmcr/updates

Updating some files...