Resolves #123