Removed settings and improved the substring handling
Merge pull request #6 from jontelang/master

Removed settings and improved the substring handling