Import of Version 0.5.4