10346 - Peter's Smokes - Aceptado (Java)
Merge origin/master