Import of Version 0.4.0