v7b
Merge pull request #9 from Pazyryk/v7-hotfixes

v7b