This should hopefully fix #246
Merge remote-tracking branch 'remotes/origin/dev' into fix_#246
Merge pull request #378 from RomanZhilich/fix_#246

Fix #246