Changes made by Veselin Dimitrov (vidimitrov94@gmail.com).