Fixes #23, Fixes #22