Merge pull request #60 from fsb4000/fix-problems