Merge pull request #374 from nwinklareth/master

Model changes to deal with scraping problems associated with issue #372