Merge pull request #159 from HRogge/for-15.05