Main + frames
Merge branch 'master' of github.com:Nozdi/shmir
Merge