added by Dimitry

Merge to stable release now
added by Dimitry