Resolves #45, resolves #46