Merging branch to Master

Fixed conflicts, merging branch