fixed bug with empty name
fixed conflict at 2de0ea9