Fixes #115
Merge pull request #166 from jbickar/7.x-2.x

Fixes #115