Updated to Version 0.3.0 BETA