Fixes #15

Fixes #15
Fixes #16

Fixes #16