fix
Merge remote-tracking branch 'Varbanets/master'