Merge pull request #596 from danielhoherd/master