some editional changes
Zmergowano commity