#337 i #338
Merge remote-tracking branch 'origin/dev' into dev