Code-Review

Please review my code
@byabrik Could you commit changes after fix?