Added CLI options
Works in the browser as well now