Was fixed some issues for pull request.