Frames improvements
Merge pull request #368 from OndraZizka/master

Frames improvements