Changes made by Georgi Vorobyov (georgi.vorobiov@gmail.com).