Properly designate regex matcher. Fixes issue #169.
Merge branch 'dev' into features/plugin-restarting
Merge branch 'features/plugin-restarting' into features/amqp-plugin