Added ability to execute from command prompt