merge from impl_Greeting to master