Commited #53 after confirmation and testing.