Fixes #113
Fixes #14
improves #13