Fixes #52 Fixes #61