Merge pull request #690 from tpdownes/master