Fixes #13, fixes #14