20131011 update with regex plus fix