added Country field. Close #4