Resolves #154