Added to model
Unit test update
Merge remote-tracking branch 'upstream/master'
Update Unit Tests
Merge pull request #120 from jerv13/master

Added to model, update Unit Tests