Resolves #224