v7 hotfix a
Merge pull request #8 from Pazyryk/v7-hotfixes

v7 hotfix a