Resolves #46