Fixes #23. Fixes #24