Merge pull request #1 from laurenkruczyk/master

aug 4 work