Some code improvements:

- Added default parameters

- Renamed all 'options' to 'parameters'

- Added parameter to specify output storage order