Merge pull request #189 from konstantin-komelin/D7