finish work on changes (+2 squashed commits)
Squashed commits:
[d1ea0a0] commit 2
[5bcb061] 1 commit
Merge pull request #1 from litvinchuk/master

Important changes