fixes #15
fixes #14