Merge pull request #122 from HRogge/for-15.05