Removed Debug message.
Updated RegEx patterns
Added new RegEx patterns