Import of Version 0.8.4