Resolves #16