Merge pull request #693 from mauricemeyer/master