Build failure fix
Merge pull request #281 from tmughal/master

Build failure fix