Import of Version 0.10.1