Merge pull request #458 from dmorilha/fixes-for-rpi-compilation