Applying Istvan's fix
Merge pull request #178 from einhverfr/1.3

Applying Istvan's fix