Changes made by Svetlio Kolev (svetliokolev@gmail.com).