Fixes #3 fixes #15