fixes #14
fixes #15 #16