Hopefully silencing undef warnings
Merge pull request #225 from einhverfr/1.4

Hopefully silencing undef warnings