Version 1.0.2 Update (Addressing Issues from 1.0.1)