Resolves #23  (again)
Resolves #19