Fixes #27
Issue #25