fixing 1268
fixing 1268
Merge pull request #518 from einhverfr/1.4

fixing 1268