Commited #53 after writing comments.