Merge pull request #3 from mrstocks/master

Updating