fix compilation errors
Merge pull request #265 from krzysiekbarca/devel

fix compilation errors