Merge to version 0.0.8