Merge pull request #704 from MikePetullo/master