Changes made by Lachezar Lechev (luudman@gmail.com).