1.0.2 - Final update