Merge branch 'house_current' of https://github.com/mishki-svami/house.git into house_current