Version 1.0.4 Beta 2