Merge pull request #874 from devmapal/master

Fixes compilation error