upd
Merge branch 'master' of git://github.com/nikopolidi/tzm-blade into dev