fixed some compilation errors
Merge branch 'master' of https://github.com/scnakandala/datacat