Fixes #18
Closes #15
Fixes #18
Closes #19