Initial commit for 1.0.4.1