Updated version 1.0.4