Updates
Merge https://github.com/ericxx1/EricHouse