Update to include the standalone option