Resolves #7, #14