Merge pull request #716 from kbarmen/master