Commit by Vladimir Gekov and Asen Stoilov