I think this resolves #19