Changes made by Boyan Nikolov (boby.work@hotmail.com).