Changes made by Martin Dzhonov (martin.dzhonov@gmail.com).