First version
[XX-1022] Added feature

Fixed strange bug