Merge pull request #128 from HRogge/for-15.05