Commited #101 after modification.