Merge pull request #1 from mrstocks/master

merging