Wire - changes
Merge branch 'master' of github.com:4nzu/wire-mainframe