Fixing and closing #32