Improve code
Fix errors
Merge branch 'lyubomyr-shaydariv-master'