Changes made by Nikolay Zhelyazkov (zhelyazkovn@gmail.com).