Merge pull request #68 from rogerpueyo/for-14.07