Merge pull request #1 from laurenkruczyk/master

aug 4 work
Merge pull request #1 from hzab/master

Merge pull request #1 from laurenkruczyk/master