Commited #53 after modification.