Changes made by Svetlio Toskov (s.toskov@gmail.com).