4 week tasks
some fixes 4 week
Merge pull request #210 from microwolnovka/new_4_wekk

some more improvements of 4 week