Changes made by Srđan Matić (srmatic@gmail.com).