Minor correction
Added TODO
Added calculation of spike width

Spikewidthe is now calculated with the SpikeWidth function and added to
the return struct
Minor fiddling