Merge pull request #124 from gameblabla/buildingfixes