Slightly modified regular expression, some test data added, formal style of code updated.