Import of Version 0.11.1