Merge pull request #120 from jerv13/master

Added to model, update Unit Tests
Fix plugin ordering.