Comments and test added.