Changes made by Tsvetan Manev (tsvetanmanev@gmail.com).