Added bStateSave option

Set to false by default.