Merge pull request #137 from nwinklareth/master

Fixed issue #127, by correctly changing all of the model defections for ...