...
fixes #27
fixes #24