fix home/init
merge dev1 & master