make the shit compile
merge master
add missing inc