Issue 24 - Use Matcher.find() instead of Matcher.matches()