Second master version
[XX-1022] Added feature

Fixed strange bug

Another bugfix