Bug fix
Bugfix
resolve conflict
Merge pull request #27 from VladislavPovedyuk/dev

Dev