#345 mechanika (kilka zmian)
Merge remote-tracking branch 'origin/dev' into dev