added test2
merge a pull