Merge for ver.0.1.1 alpha