Updated to non-pushed original v1.0.3
Finished