regex improvements
Merge branch 'develop' of https://github.com/WPAFC/afch into develop