Resolves #35