Command-line extensions are in, in a very simple form. 

Change-Id: Id31c83406bec9b59eb8636f448d7d3bba9184f8c
Signed-off-by: Roozbeh Farahbod <roozbeh.farahbod@sap.com>