Merge pull request #162 from 5150Joker/dev

Moved Stamatios into a building