Cleaned up regex structure for future analysis / improvement.
Updated changelog and version number