Changes made by Rumen Georgiev (rumbata86@gmail.com).