added hut and rain
merge from master