added some 'testing', tweaking regex and cleanup of logging
some testing completed
Merge pull request #1 from pherris/tweaks

improving implementation regex and adding some test examples