Resolve #17. Resolve #9.