Merge pull request #2 from brockallen/master

v7.2 merge