fixes #83
#29
fixes #137