Added ability to pass keyword from command line