Improved invocation with arguments support
Normalize line endings
Solved merge conflict