Dev

Fixes #20. Fixes #23. Fixes #6.