Import of version 0.6