Merge pull request #56 from fsb4000/bad-fix