Cleaned Code, and updated to 1.0.2