Merge pull request #60 from BillsJ/master

substring and the unforgivable error