updated to 1.0-BETA