Added argument support and version command