Fixes #36
Work on #35
Resolves #32