v7d
unit work for 7e
more unit work for 7e
Merge pull request #12 from Pazyryk/v7-hotfixes

V7 hotfixes