Combined building methods
Merge pull request #33 from Jbtyson/buildings

Combined building methods