person added
added if statement
merged branches