Changes made by Štěpán Mráček (stepan.mracek@gmail.com).