Merge pull request #545 from raoulbhatia/master