Fixes #120
fixes #115
fixes #114