Import of Version 1.0.4