Added expand option
Added format option
Added inlinecount