Added additional metrics to models
Merge pull request #33 from shawnhermans/additional-metrics

Added additional metrics to models. Closes #29