Import of Version 0.13.1