base.h v1.4
refact types
Merge branch 'refact' into dev