Resolves #33