Merge pull request #1 from Cdingram/master

first commit