Updated to Version 0.3.1 BETA