Merge pull request #251 from ChristianMurphy/develop

fixing models
fixing jshint error