Merge version 0.0.6