Merge pull request #802 from joeframbach/master