- Added support for gaps in data
- Some changes to format of output