issue31

gh-31 Fix