Pull Request after CLA - 29 Nov 2014 - 4