Import of Version 0.6.1