Merge branch 'release_1.1'
Added type getters
change the file format
Merge branch 'master' into develop