Fixes #15, #16