fixes #27, #28