Merge pull request #14 from RomeshPanditha/master

Merge back into personal fork
More changes to houseInfo
Merge pull request #21 from HarrisonDempsey/master

Merge into master