commit by Vladimir Gekov and Alexander Bonev