fixes #13, #14