fixes #26, #27