Merged David's patch that allows indentation amounts to be specified in the file's header