Merge pull request #174 from HRogge/for-14.07