Merge pull request #184 from 5150Joker/dev

Sofia redone + Map fixes.