Changes made by Radoslav Sholev (radosholev@gmail.com).