Fixes #13, #15