add Typeable trait
Merge branch 'master' into develop
fix merge