Commited #53 after conflict modification.