Fix #41: Bug with regex was fixed
Fix #51: Done