Added __main__ to run from command-line