Fixing bug 1131
Merge pull request #215 from einhverfr/1.4

Fixing bug 1131