Merge with 0.9 version