Merge pull request #738 from fundatillus/master