More fixes and studios
Merge pull request #66 from SmakyTaky/master

More fixes and studios