Merge pull request #23 from hreikin/devel

merge to fix errors
Merge pull request #24 from hreikin/mesa-noegl-devel

Merge pull request #23 from hreikin/devel