Issue38 updates buildings

This pull request will update the `Annex60` library with changes from the `Buildings` library.