Resolves #155