Changes made by Ilian Iliev (iliev.net@gmail.com).