Bug fix #56: Added model metrics
Merge remote-tracking branch 'origin/master'