Resolves #43
Resolves #30