Resolves #133