QML support
Merge pull request #1806 from skozlovf/master

QML support