Commited #101 modification.