ver0.1.6 (Issues #7)