Merge pull request #595 from danielhoherd/master