Merge pull request #67 from fsb4000/patch-1