added testing code
merge commit