Changes made by Georgi Rusev (georgir@gmail.com).