almost done with Bonus II
Merge remote-tracking branch 'origin/Smaranda'