Version 1.0.4 BETA 1