fixes #13, fixes #14