Imported 0.8.0 version