v20130112, Add feature #21