Updated to Version 0.2