Merge pull request #18 from greynolds123/master

Testing the merge