Correct building address and add room details.
Merge pull request #23 from msweeney/master

Correct building address and add room details.