Merge pull request #15 from dannyyoo/master

Correcting indexOf and adding lastIndexOf.