Merge branch 'dev'
format output
devide Building class and fix typo