Resolve #53 and resolve #47