Merge for version 0.0.1