Removed my made up 'sub' definitions
Tiny changes to regexp
Changed a comment
Use (?s) instead of [\d\D]
Fixed gitignore
Updated inc
Various small fixes