#4 merge manual

#4 merge manual