Resolve #1
Resolve #2