Added camera matrix output
Merge of 2 last commits