Applied improvements in Master branch

conflicts are solved for merging