Resolve #8
Resolves #7.