1.0/dev-BUG01

Conflicts are fixed and codes are merged.