- Added matrix support
- Small improvements