initial type
Merge branch 'master' into Types
meged with Types