Resolves #29
Resolves #31