Merge pull request #702 from tphoney/raoulbhatia