Reformatting Code Pull request #138
Debuging:  deal with empty fields