Fix URL matching #17
Fix bug: #27