Added html output generation + fix in signature parsing regex