Import of Version 0.7.1