Fixes #101. Fixes #102.