Adding indexOf fix for browsers that don't natively support Array.indexOf()
Merge branch 'feature/indexof-fix' into dev