non working changes
wadak na
conflict resolved
merged master to second
origin