Skubarenko/dev

[skubarenko]

This pull request is a group of other pull requests. It includes the following pull requests:

• [x] #116
• [x] #118
• [x] #120
• [x] #121
• [x] #123