Added more patches and helpers, improved checking
Update helpers.js
Made checks more robust
Merge pull request #6 from nicbell/master

Noticed a bug on S2, fixed now