Fixes #18, definitively fixes #14 and #15