v1.0.4 with corrections'