Changes made by Miroslav Vitanov (mvvitanov@gmail.com).