Version 0.3.2: Bonus completed