Changes made by Georgi Ivanov (georgi.denchew@gmail.com).