Version 1.0.4a final