Today's changes:  Add few functions, improve unittest