Resolves #185