Changes made by Petko Arbov (parbov@gmail.com).