added matio support
Tweaks / comments