closing #89, more tests needed