fix make file
Merge branch 'zabr'
fix type declarations, replace all file
Merge branch 'zabr'