Resolves #1
Resolves #2