Resolve #22
Resolve #25