Commited #53 after confirmation.