v7e
Merge pull request #13 from Pazyryk/v7-hotfixes

v7e