Added method to return diagonal as a vector, and corresponding tests.
Added Constants header.
Merge remote-tracking branch 'origin/master'