Resolves #25
Resolves #34