Merge pull request #175 from HRogge/for-15.05