Updated to Version 0.2.1 BETA